EMPIREDB-362 RecordFactory fix
3 files changed