CAAERS-6545 updated comments