Merge branch 'hotfix/errorfix2' into develop
delete and redeploy
Merge branch 'release/del-and-redeploy'