Merge "Enable SplitSelect flag by default" into sc-v2-dev