Update latest changes of React port