Apply changes from Atmosphere/react-protocol@f7999fa2