EMPIREDB-368 fix
7 files changed