[CLC-506] Updated comments