TRUNK-4287: Changes applied as advised