CDAP-611: addressed PR comments