Merge branch 'feature/drush-cleanup-function'
Add conditions where special cases needs all types of documents.
Merge branch 'hotfix-1.0.5' into develop