Merge branch 'hotfix/0.6.4'
Merge branch 'develop'
Merge branch 'develop'
Bugfix: Criteria matching now checks all statuses and has no limit
Merge branch 'hotfix/0.6.7' into develop