[CDAP-9650]