LB-484: User Comments

Comments as a source fix