Update the way we get not deleted entities
Merge tag 'refs/tags/v2.3'

Creating v2.3