v1.4.2: Merge pull request #1700 from facebook/dev