refactor style reset function
Merge branch 'master' into dev09
Merge branch 'dev09' into deploy09