GPII-515: updated comments.