Merge "Show class name in error message" into rvc-dev