Merge branch '03-MultiFileHashMap' into 03-MultiFileHashMap-mergeable