#JC-1380: Fixed review remarks