Merge "Fix getting wrong instance when restoring non-config" into nyc-support-25.4-dev