JC-1688: changes according to review notes
JC-1688: changes according to review notes