Merge pull request #5546 from cb1kenobi/3_2_X_hybrid

[TIMOB-14611] Style cleanup.