Merge branch 'client-connection' into meshes