Minor changes in uer.
Merge branch 'test' into dev