Merge "Ensure that User::getId() returns int"