Some changes into UT
Merge branch 'develop'