fix install scaffolding
Merge branch 'master' into feature/installation