Merge branch 'master' into no-self-connect