Merge branch 'pr/remotes-in-hashmap'