Issue #28139: Merge indentation fixes from 3.6