Thanks @behdad, we'll merge from upstream. @gymora, please remove them from this pull.