Defensive code for case when we have a pending change queued for a deleted item
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev