Pack-scan changes

This has no test coverage.