Merge "Flexible split: mBounds1 and mBounds2" into main