Merge "Add separate CDAP inputs"