Added delete all
Merge branch 'master' into unified_api