[artf709155] commentrollback changes from release preparation of 1.5