Merge branch 'hotfix/2.1.6'
add select distinct
Merge branch 'hotfix/2.1.7' into develop