Merge branch 'jt/subprocess-handshake' into maint