Update to support keeping STDIN open via machine option