Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev