Merge branch 'soreuseport-mixed-v4-v6-fixes'