Merge pull request #3984 from facebook/dev

v1.5.6