Merge branch 'master' into dev-sqm
fix bug when standarize input value
Merge branch 'dev-sqm'