sync with en-US rev3400:7c94debc8b93 (B2G 2.0)