Merge "Simplify control block flag names"