tickets https://code.vereign.com/code/dashboard/issues/551 https://code.vereign.com/code/dashboard/issues/552
No changes between delete-entity and master