Merge "look for old intent values" into oc-dev