Performance enhancements for delete all identities functionality.
Merge branch 'master' into gui-devel
Small code improvements.
Merge branch 'master' into gui-devel