Merge "Fix failing tests in CrossProfileTest" into rvc-dev