fixed CCS message listener and dispatcher
Merge branch '3.4.x'