Merge "Add framework compatibility matrix" into oc-dev