Merge "Make socket binding behavior clearer"