JC-1170: Changes according to review comments