Merge branch 'jb/remote-rm'