CDAP-531: Update PR according to last comments