User service uses jid instead of rid.
Merge remote-tracking branch 'origin/master'