Merge "New fix for issue 4111672: control block flags"