fix UT
Merge branch 'develop'