#JC-1205. Changed comments