BUG-7464: Switch to use forked TrieMap