Speed up setup process
Merge branch 'master' into bootstrap