Merge "Add flexible split flag" into main