Merge branch 'csock-seqpoacket-small-fixes'