BACKLOG-845 corrected comments