Merge "RecoverySystem: Verify the package compatibility." into oc-dev