Merge "Flexible Split: State manager" into main