add useCriteria
Merge branch 'develop'