Merge branch 'pj/remote-set-branches-usage-fix' into maint