Merge pull request #5545 from cb1kenobi/master

[TIMOB-14611] Style cleanup.