Merge "Even cleaner shutdown." into jb-mr1-dev