#FEC-1572 #comment code optimization