#JC-1262 changes after code review