Merge "split LightRefBase out of RefBase" into oc-dev