Deprecated entity (Data) support
Merge pull request #99 from kaysoky/SYNR-591

SYNR-591