Merge branch 'jc/remote-setbranches-usage-fix'