Merge "Fix UserManager#isUserAGoat" into lmp-dev