INT-2822: Polishing after rebase