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