Merge branch 'master' into dns-cluster-discovery