[2.3.x] [2.3.x] + SPDY fix and minor updates