fix type error format
Merge branch 'master' into cmd-update