Merge branch 'attach-and-redirect-helper' into patches