bugid:96495 make evolve skin important
Merge remote-tracking branch 'origin/dev' into dev