add select distinct
Merge branch 'hotfix/2.1.7'