Table versioning / soft deletion changes.
Merge branch 'develop' into jira/3987