Merge branch 'master' into graceful_stop