[TIMOB-10464-3_0_X] Whitespace cleanup from manual merge