CDAP-811: addressed PR comments