Re-add UT
Merge branch 'dev' into release-0.7.16