Adding CMSG_DB_QUERY Handler
More stuff for CMSG_DB_QUERY
Fixes Build
Merge remote-tracking branch 'upstream/master'