Merge "Remove redundant isSplit assignments" into main