ubf_thrift v0.1.6.1
Merge remote-tracking branch 'origin/dev'