Merge "debug: Allow the DBQuery channel to be used"