Merge branch 'rs/use-child-process-init-more'