Merge "Use different versions for framework compatibility matrix" into oc-dr1-dev