Get fork up to date

This is just to get this up to date and resolve the conflict before I do a PR with the react changes.