Issue #28139: Merge indentation fixes from 3.5 into 3.6