Revert "Merge branch 'hotfix/HCP-26-create-doctor-testcase-fix' into 'develop-beta'" See merge request !34