Merge "Fix support for @empty in style resolution" into oc-dev