Merge branch 'fc/remote-helper-fixes'