Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev