JC-1339 Added comments.