#2182 - added comments