Merge "Remove forward matches before checking for default" into oc-dev