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

WOBS-3117: Partially restores previous verion of entity