sync with latest Reactor changes