Faster shutdown
Fix build
Merge branch 'master' into builds
7.125