Merge branch 'selftests-forwarding-various-fixes'