v1.4.1: Merge pull request #1691 from facebook/dev