reset ut_last_cond
merge with origin/master