Merge branch 'fib-offload-notifications'