Added config flag for admin scripts
Merge branch 'develop' into feature/cache-work