Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev