Merge "Make sure theme attributes don't get lost" into oc-dev