JC-1449 - Added comments