Merge branch 'mh/get-remote-group-fix' into maint