Merge branch 'jk/remote-helpers-doc' into maint