Sandesh | #417 | Fixing defects related to approver flow