WOBS-3117: Partially restores previous verion of entity
Merge pull request #637 from m038/WOBS-3117

WOBS-3117: Partially restores previous verion of entity