Merge pull request #10102 from seiko2plus:coreVsxPacksFix