Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'