Merge branch 'selftests-forwarding-Two-small-changes'