Merge "Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 1e20bf871c am: 018d33893a"