Merge branch 'hotfix/deploy-permissions'
Minor cleanup of scripts
Merge branch 'hotfix/cleanup' into develop