Merge "Revert "Revert "Resource ID fixup.""" into oc-dev