Merge "Move a final flush to Shutdown" into devel/master