CDAP-15: fixed PR comments