ADEN-1532 Fix CR comments.