[CDAP-869] Addressed review comments