Merge "Change error and none messages" into rvc-dev