Sync from HG (v2.3 milestone)