Merge "Add trie based greedy prefix construction"