Fix deleting entries
Merge pull request #3028 from obrignoni/2.3/develop

Fix deleting entries
Merge branch 'refs/heads/2.3/develop' into 3.0/develop