Merge branch 'fib_select_default-fixes'