Merge "CDD: Offload Keep Alive messages" into qt-dev