INT-2878: Polishing according PR's comments