COOPR-518: fixed PR comments