Better size of control/targ.
Merge branch 'master' into zhipeng-jia