CON-1814 add needed comments