[BZ105][RC668] Add comments