Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'