Issues #29189: Merge indentation fixes from 3.5