Merge branch 'fib_trie-next'