Use ECMAddQch over own old copy KDbAddQCH
Once min ECM version is bumped to >= 5.36.0 by !2 (merged) this here could be rebased and landed as well.
Not doing any version bump in this patch itself to avoid conflicts, due to assuming !2 (merged) will go in :)