JC-1508 Added comments.