Merge branch 'master' into config-checks-ipv6