EMPIREDB-362 Serializable fix
3 files changed