Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd' * commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd': Add shutdown assurance
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd' * commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd': Add shutdown assurance