Merge branch 'fib_trie_table_merge_fixes'