[#32322] com_config is broken at hathor (Fix #2261)
Merge remote-tracking branch 'upstream/master' into dbdeletequeries