Merge "Fix incoming connection problem"