refactor style reset function
Merge branch 'master' into dev09