CDAP-610: fixed PR comments