Merge branch 'mg/fix-build-remote-helpers' into maint