Merge "Keep split bounds after configuration update" into sc-v2-dev