UserMerge support

Appears to work via manual testing, I couldn't think of a good way
to programatically test this.

Change-Id: I58ab79a1d65ee7c889aede36199a1b511f6283b5
Merge "UserMerge support"