From: https://github.com/unified-db/Database/commit/5caafd7a0cb9b56755e3617b39f450828de6a389 Closes #20679 For 3.3.5 Only