Merge branch 'dg/run-command-child-cleanup' into maint