[zh] merged contribution from Simon Pan