CON-549: Changed comments