Merged to 'feature/add-new-radar-patients' to remove duplicate branch
Move merging to 'feature/add-new-radar-patients' to remove duplicate branch
Fix to accommodate different user path on Dev