#14034: merge indentation fixes from 3.2.