TCP uses packet 4 option now.
Merge branch 'test' into dev