Add ability to get not deleted
Merge tag 'v2.3'

v2.3