Merge remote-tracking branch dt/RxJS