(cherry picked from commit 1553cc02fb2bce477b4ce9b2e93a68b97aa20b29) Fix build (cherry picked from commit 2cac8e43a5a382f57b416a5df6c93615ed4cbddb) DB: fix error (cherry picked from commit 0663e6a180feb347e5d5c0b4e9359b2cb06ed547)
(cherry picked from commit 1553cc02fb2bce477b4ce9b2e93a68b97aa20b29) Fix build (cherry picked from commit 2cac8e43a5a382f57b416a5df6c93615ed4cbddb) DB: fix error (cherry picked from commit 0663e6a180feb347e5d5c0b4e9359b2cb06ed547)