Merge branch 'nm-remote-id'