Merge branch 'heroku-deploy' into develop. [Fixes #52133857 Fixes #52395183 Fixes #52151543 Fixes #52824473]
Merge branch 'develop' of github.com:camsys/oneclick into develop