Arrange the comment according to MODCLUSTER-332.