Merge branch 'cs/store-packfiles-in-hashmap'