Merge "Keep spans while transforming to uppercase" into oc-dev