HCOLL-230 - updated comments