Merge "Add a flag to determin whether to support legacy split" into sc-dev