Merge "Fixes failed tests in PackageManagerTests" into rvc-dev