Merge "UserController/Manager loglines"