Merge "Simplify control logic" into main