Bug 20xx: Fixes regarding blocking send in socket, also got rid of the second+fragment style timestamping and renamed timestamping mathods accordingly
Merge branch 'b20xx-fixed-timestamps-and-socket-block' into development