Merge pull request #3595 from facebook/dev

v1.5.5 last changes