Merge "Bug 6406: Fix radix-trie insertions"