Merge "Add unit tests for recent regressions" into rvc-dev