Merge "Avoid some unused parameter IDEA errors in User.php"