LPS-45660 Changed methods to have no return value of User
LPS-45660 Updated usage where necessary
LPS-45660 Autogenerated