Merge "Deliver internal server errors to the client" into rvc-dev