new shutdown parameter in wrapper-custom.conf
Merge remote-tracking branch 'origin/master'