Merge "Update compatibility matrix logic." into oc-mr1-dev