Bug 1790 - Merge code of Mainland edition and Taiwan edition
No bug - Version bump