Fixed CR comments, related to issue #2112