Merge "Make multi-instances split opt-in based" into tm-qpr-dev