CDAP-654: addressed comments