Hot Fix Version 2.00
Merge branch 'HotFix2' into Taiwan