Merge pull request #1050 from flowforge/zj-redirect-exec

Merge pull request #1050 from flowforge/zj-redirect-exec #1060