Fix manager connection close in originate
Merge remote-tracking branch 'origin/ism' into ism