Merge with v1.06.06.400 by RichardFeng
1.06.08.402
56789