Merge branch 'ipv4-routing-cleanups'