Merge "Fix getting wrong instance when restoring non-config" into oc-dev