Merge branch 'fib-rule-selftest'