Merge "IndexPack: Correct thin pack fix using less than 20 bytes"