#REDCORE-149 #comment adding completed