COOPR-520: fixed PR comments